add ground temperature 1m as option to weather data #1351

pierrepetersmeier · 2025-06-26T09:27:31Z

Resolves #1343

…eather-data

…to-weather-data

danielfeismann

Didn't get to all of it. Just a first view thoughts that imho needs to be adapted. As well it might get easier since it would reduce the amount of changes.

src/test/groovy/edu/ie3/test/helper/WeatherSourceTestHelper.groovy

src/main/java/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactory.java

src/main/java/edu/ie3/datamodel/io/factory/timeseries/IconTimeBasedWeatherValueFactory.java

...t/groovy/edu/ie3/datamodel/io/factory/timeseries/IconTimeBasedWeatherValueFactoryTest.groovy

src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvWeatherSourceIconTest.groovy

…to-weather-data

src/main/java/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactory.java

…eatherValueFactory and IconTimeBasedWeatherValueFactory

…to-weather-data

danielfeismann

This looks already quite ok, but I guess some parts can be improved.

src/main/java/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactory.java

src/main/java/edu/ie3/datamodel/models/value/GroundTemperatureValue.java

src/main/java/edu/ie3/datamodel/io/factory/timeseries/IconTimeBasedWeatherValueFactory.java

src/main/java/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactory.java

…to-weather-data

…1m-as-option-to-weather-data' into pp/#1343-add-ground-temperature-1m-as-option-to-weather-data

…to-weather-data

…1m-as-option-to-weather-data' into pp/#1343-add-ground-temperature-1m-as-option-to-weather-data

…to-weather-data

danielfeismann

Ok we're getting closer and by the way exploited another issue, which make me stopping my review within the tests. But please start alreay with my comments below

docs/readthedocs/models/input/additionaldata/weathersource.md

src/main/java/edu/ie3/datamodel/io/factory/timeseries/IconTimeBasedWeatherValueFactory.java

src/main/java/edu/ie3/datamodel/models/value/WeatherValue.java

src/main/java/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactory.java

src/main/java/edu/ie3/datamodel/io/factory/timeseries/IconTimeBasedWeatherValueFactory.java

src/main/java/edu/ie3/datamodel/models/value/WeatherValue.java

.../groovy/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactoryTest.groovy

Co-authored-by: Daniel Feismann <98817556+danielfeismann@users.noreply.github.com>

…to-weather-data

src/test/resources/edu/ie3/datamodel/io/source/sql/_weather/icon/weather.sql

…_level_2 values in cosmo weather.sql

…to-weather-data

docs/readthedocs/models/input/additionaldata/weathersource.md

CHANGELOG.md

danielfeismann · 2025-11-11T08:32:03Z

src/test/resources/edu/ie3/datamodel/io/source/sql/_weather/cosmo/weather.sql

+      ground_temperature_level_1 double precision,
+        ground_temperature_level_2 double precision,


could you please align the format here

src/test/resources/edu/ie3/datamodel/io/source/sql/_weather/icon/weather.sql

danielfeismann · 2025-11-11T08:34:07Z

src/test/resources/edu/ie3/datamodel/io/source/sql/_weather/icon/weather.sql

+    tg_1 double precision,
+    tg_2 double precision,


Please name them here same as in cosmo. Or is there a reason not to do so?

The other entries also have a different naming strategy than in Cosmo.

danielfeismann · 2025-11-11T09:16:20Z

.../groovy/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactoryTest.groovy

+        Optional.of(Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE)),
+        Optional.of(Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE))))


This is not correct. see #1470

Please have a look on my proposal in #1470 and adapt the check of the expected values the same way (split into model.time == expected.time, and same for .values)

src/main/java/edu/ie3/datamodel/models/value/WeatherValue.java

src/main/java/edu/ie3/datamodel/io/factory/timeseries/IconTimeBasedWeatherValueFactory.java

src/main/java/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactory.java

danielfeismann · 2025-11-11T09:20:44Z

src/test/groovy/edu/ie3/test/common/TimeSeriesTestData.groovy

  UUID.fromString("a4bbcb77-b9d0-4b88-92be-b9a14a3e332b"),
  ColumnScheme.ENERGY_PRICE
  )



e.g. what happens if we only get one ground temp and not two?

Co-authored-by: Daniel Feismann <98817556+danielfeismann@users.noreply.github.com>

…to-weather-data

pierrepetersmeier added 2 commits June 18, 2025 16:26

Add ground temperature (1m) as option to weather data.

6bb6984

Merge branch 'dev' into 1343-add-ground-temperature-1m-as-option-to-w…

0342ae2

…eather-data

pierrepetersmeier self-assigned this Jun 26, 2025

danielfeismann added enhancement New feature or request labels Jun 26, 2025

pierrepetersmeier added 2 commits July 2, 2025 16:43

Address review feedback and align test suite

920be80

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

e259bee

…to-weather-data

danielfeismann requested changes Jul 3, 2025

View reviewed changes

pierrepetersmeier added 4 commits July 9, 2025 23:20

fixing the comments and tests.

1b8dd09

fmt

6a77ffc

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

d46b0d1

…to-weather-data

Meeting

9f767ed

danielfeismann reviewed Jul 14, 2025

View reviewed changes

src/main/java/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactory.java Outdated Show resolved Hide resolved

pierrepetersmeier added 2 commits July 16, 2025 10:23

Add GroundTemperatureValue and refactor WeatherValue, CosmoTimeBasedW…

b015b66

…eatherValueFactory and IconTimeBasedWeatherValueFactory

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

8e33409

…to-weather-data

danielfeismann added this to the Version 8.2 milestone Jul 25, 2025

pierrepetersmeier added 4 commits July 28, 2025 11:16

Remove logger.warn

b0d87d9

fmt

0399aa3

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

813cdbe

…to-weather-data

fmt

88191d1

danielfeismann requested changes Aug 14, 2025

View reviewed changes

pierrepetersmeier added 9 commits August 18, 2025 14:58

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

47ac942

…to-weather-data

fmt

41302fe

Merge remote-tracking branch 'origin/pp/#1343-add-ground-temperature-…

3c153a3

…1m-as-option-to-weather-data' into pp/#1343-add-ground-temperature-1m-as-option-to-weather-data

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

83b3736

…to-weather-data

Merge remote-tracking branch 'origin/pp/#1343-add-ground-temperature-…

13f27ee

…1m-as-option-to-weather-data' into pp/#1343-add-ground-temperature-1m-as-option-to-weather-data

Add GroundTemperatureValue 0cm and 80cm.

55a7c15

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

cde88f0

…to-weather-data

Fix SqlSinkTest

f0698b4

fmt

1d9ff09

pierrepetersmeier added 2 commits November 2, 2025 23:08

fmt

c067c0b

fmt

64c0172

danielfeismann requested changes Nov 3, 2025

View reviewed changes

pierrepetersmeier and others added 9 commits November 4, 2025 11:12

Update src/main/java/edu/ie3/datamodel/models/value/WeatherValue.java

d691a2c

Co-authored-by: Daniel Feismann <98817556+danielfeismann@users.noreply.github.com>

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

e80cb33

…to-weather-data

Optional

42e8599

FlatMap instead of Map. Optional in Tests.

ae9da09

enhancing TimeSeriesProcessor

481ab12

sonar

5efc4d2

optinal empty

41d031e

Rename ground temperature columns in SQL schema

a1967ea

Rename GroundTemperature variable

aa481ca

pierrepetersmeier force-pushed the pp/#1343-add-ground-temperature-1m-as-option-to-weather-data branch from b09a3ba to aa481ca Compare November 6, 2025 13:51

pierrepetersmeier added 2 commits November 6, 2025 14:52

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

ac127ec

…to-weather-data

Fix tests

9d7215c

danielfeismann reviewed Nov 6, 2025

View reviewed changes

src/test/resources/edu/ie3/datamodel/io/source/sql/_weather/icon/weather.sql Show resolved Hide resolved

pierrepetersmeier added 9 commits November 7, 2025 12:31

Re-add t_2m and add ground_temperature_level_1 and ground_temperature…

2b6ed95

…_level_2 values in cosmo weather.sql

Rename ground temperature constants for consistency

fe531ab

Rename tg_1 and tg_2 to tg1 and tg2

47455fe

Add t_g column to weather SQL schema

6338599

Remove t_g

b4ace56

Fix InfluxDbWeatherSourceIconIT.groovy

2da8ced

fmt

f85cf9b

fix InfluxDbConnector.java und weather.txt

9a6840c

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

da1a8cf

…to-weather-data

pierrepetersmeier requested a review from danielfeismann November 10, 2025 12:04

danielfeismann requested changes Nov 11, 2025

View reviewed changes

pierrepetersmeier and others added 3 commits November 11, 2025 13:15

Update docs/readthedocs/models/input/additionaldata/weathersource.md

c5d924d

Co-authored-by: Daniel Feismann <98817556+danielfeismann@users.noreply.github.com>

Update CHANGELOG.md

2aba46d

Co-authored-by: Daniel Feismann <98817556+danielfeismann@users.noreply.github.com>

Merge branch 'dev' into pp/#1343-add-ground-temperature-1m-as-option-…

857989d

…to-weather-data

		ground_temperature_level_1 double precision,
		ground_temperature_level_2 double precision,

		Optional.of(Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE)),
		Optional.of(Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE))))

add ground temperature 1m as option to weather data #1351

Are you sure you want to change the base?

add ground temperature 1m as option to weather data #1351

Uh oh!

Conversation

pierrepetersmeier commented Jun 26, 2025

Uh oh!

danielfeismann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

danielfeismann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

danielfeismann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

danielfeismann Nov 11, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

danielfeismann Nov 11, 2025

Choose a reason for hiding this comment

Uh oh!

pierrepetersmeier Nov 11, 2025

Choose a reason for hiding this comment

Uh oh!

danielfeismann Nov 11, 2025

Choose a reason for hiding this comment

Uh oh!

danielfeismann Nov 11, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

danielfeismann Nov 11, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants